Fix double accounting of border width

For csd, we were subtracting the border width one too many
times from the child height, causing clipped off content e.g.
in the 'Properties' window in testgtk.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 59598b5a6277019499d7865ae30c732682acf411..0595114edeb4c86a12d9878508173031e514024e 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6073,7 +6073,9 @@ _gtk_window_set_allocation (GtkWindow           *window,
                             title_border.top +
                             title_border.bottom;
       child_allocation.width -= window_border.left + window_border.right;
-      child_allocation.height -= child_allocation.y + window_border.bottom;
+      child_allocation.height -= window_border.top + window_border.bottom +
+                                title_border.top + title_border.bottom +
+                                title_height;
     }
 
   if (gtk_widget_get_realized (widget))